Merge branch 'master' into 3036-collection-uuids

Conflicts:
	services/api/test/fixtures/groups.yml

diff --cc services/api/app/controllers/application_controller.rb
Simple merge

diff --cc services/api/app/controllers/arvados/v1/groups_controller.rb
Simple merge

diff --cc services/api/app/models/arvados_model.rb
Simple merge

diff --cc services/api/test/fixtures/groups.yml
index f0e2d0555d684bf167a62e3efb7a99654081a2dc,c0fc79e7f630cd4e6b7945e0a28b1b9aafded145..3100a2c9536f69c216238ed717c1693378736132
--- 1/services/api/test/fixtures/groups.yml
--- 2/services/api/test/fixtures/groups.yml
+++ b/services/api/test/fixtures/groups.yml
@@@ -26,13 -29,20 +29,14 @@@ activeandfriends
    name: Active User and friends
    description:
    updated_at: 2014-08-22 14:02:18.481166435 Z
-   group_class:
+   group_class: role
  
 -system_owned_group:
 -  uuid: zzzzz-j7d0g-8ulrifv67tve5sx
 -  owner_uuid: zzzzz-tpzed-000000000000000
 -  name: System Private
 -  description: System-owned Group
 -  group_class: role
 -
  system_group:
    uuid: zzzzz-j7d0g-000000000000000
    owner_uuid: zzzzz-tpzed-000000000000000
    name: System Private
    description: System-owned Group
++  group_class: role
  
  empty_lonely_group:
    uuid: zzzzz-j7d0g-jtp06ulmvsezgyu

diff --cc services/api/test/functional/arvados/v1/groups_controller_test.rb
Simple merge