Merge branch '11807-yaml-to-json'

refs #11807

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

diff --combined services/api/db/structure.sql
index b38cba8109dda806e16446c800b7c1ea5735fd9e,66f6e71f44b2deed00a7ebf5932a1e3b5ef85676..7e6bb1dca4f0f71612e800339beba6e2f5d11344
--- 1/services/api/db/structure.sql
--- 2/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -1,7 -1,3 +1,7 @@@
 +-- Copyright (C) The Arvados Authors. All rights reserved.
 +--
 +-- SPDX-License-Identifier: AGPL-3.0
 +
  --
  -- PostgreSQL database dump
  --
@@@ -2789,3 -2785,5 +2789,5 @@@ INSERT INTO schema_migrations (version
  
  INSERT INTO schema_migrations (version) VALUES ('20170419175801');
  
+ INSERT INTO schema_migrations (version) VALUES ('20170628185847');
+