7709: Merge branch 'master' into 7709-api-rails4

Conflicts:
	services/api/app/controllers/arvados/v1/nodes_controller.rb
	services/api/app/models/container_request.rb
	services/api/db/structure.sql

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

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

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

diff --cc services/api/db/structure.sql
index 015db6ffb9a11b8a56c16e55d835b304547473be,e25a2a960571f21b823f14d4d45e619fa2c0ae9a..5c592a264b21a4dd136f9d78ba53fa24878c052b
--- 1/services/api/db/structure.sql
--- 2/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -2744,5 -2754,6 +2752,8 @@@ INSERT INTO schema_migrations (version
  
  INSERT INTO schema_migrations (version) VALUES ('20170301225558');
  
 -INSERT INTO schema_migrations (version) VALUES ('20170330012505');
 +INSERT INTO schema_migrations (version) VALUES ('20170319063406');
 +
+ INSERT INTO schema_migrations (version) VALUES ('20170328215436');
+ 
++INSERT INTO schema_migrations (version) VALUES ('20170330012505');