Merge branch 'master' into 13561-collection-versions-api

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

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

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

diff --cc services/api/config/application.default.yml
Simple merge

diff --cc services/api/db/structure.sql
index 71d630f6e81139e88800550e3fbe78bd7ab10d92,f8d9b3f35d1a68a4715256ff4dc299edd4e16b90..5b579bd39e1e8760cd3243bf7dbe50b206d131f4
--- 1/services/api/db/structure.sql
--- 2/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -3179,13 -3169,5 +3179,14 @@@ INSERT INTO schema_migrations (version
  
  INSERT INTO schema_migrations (version) VALUES ('20180904110712');
  
- 
 +INSERT INTO schema_migrations (version) VALUES ('20180913175443');
 +
 +INSERT INTO schema_migrations (version) VALUES ('20180915155335');
 +
+ INSERT INTO schema_migrations (version) VALUES ('20180917205609');
+ 
 +INSERT INTO schema_migrations (version) VALUES ('20180919001158');
 +
 +INSERT INTO schema_migrations (version) VALUES ('20181001175023');
 +
 +INSERT INTO schema_migrations (version) VALUES ('20181004131141');

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