Merge branch 'master' into 14260-runtime-token

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --cc services/api/db/structure.sql
index 636306f976e3b98a3368f0f1ed9f4dca4dd50287,5b579bd39e1e8760cd3243bf7dbe50b206d131f4..b9db1add053cf53a1295f187a1b8d9244895ec99
--- 1/services/api/db/structure.sql
--- 2/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -3173,9 -3179,14 +3183,18 @@@ 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 ('20181005192222');
 +
 +INSERT INTO schema_migrations (version) VALUES ('20181011184200');
 +
+ INSERT INTO schema_migrations (version) VALUES ('20180919001158');
+ 
+ INSERT INTO schema_migrations (version) VALUES ('20181001175023');
+ 
+ INSERT INTO schema_migrations (version) VALUES ('20181004131141');