16718: Merge branch 'master' into 16718-group-contents-collection-versions

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

diff --cc services/api/app/controllers/arvados/v1/groups_controller.rb
index 56ad2026bf25d6c29f515139501f7656ffff5d40,3e238a5adadb0223449d326cdbe0377a86e977d9..812929d500c408873472cfce1ac4261828e8f197
--- 1/services/api/app/controllers/arvados/v1/groups_controller.rb
--- 2/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@@ -32,16 -32,13 +32,16 @@@ class Arvados::V1::GroupsController < A
      params = _index_requires_parameters.
        merge({
                uuid: {
-                 type: 'string', required: false, default: nil
+                 type: 'string', required: false, default: nil,
                },
                recursive: {
-                 type: 'boolean', required: false, description: 'Include contents from child groups recursively.'
+                 type: 'boolean', required: false, default: false, description: 'Include contents from child groups recursively.',
                },
                include: {
-                 type: 'string', required: false, description: 'Include objects referred to by listed field in "included" (only owner_uuid).'
 -                type: 'string', required: false, description: 'Include objects referred to by listed field in "included" (only owner_uuid)',
++                type: 'string', required: false, description: 'Include objects referred to by listed field in "included" (only owner_uuid).',
 +              },
 +              include_old_versions: {
-                 type: 'boolean', required: false, description: 'Include past collection versions.'
++                type: 'boolean', required: false, default: false, description: 'Include past collection versions.',
                }
              })
      params.delete(:select)