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

Conflicts:
	services/api/db/structure.sql

diff --combined services/api/db/structure.sql
index 5c592a264b21a4dd136f9d78ba53fa24878c052b,d6729428beaf00e48e7bceefea2bc1df1fb843b0..3e1fa3fae4be514e5d47761ca616ef072142fae3
--- 1/services/api/db/structure.sql
--- 2/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -44,7 -44,9 +44,7 @@@ CREATE TABLE api_client_authorizations 
      created_at timestamp without time zone NOT NULL,
      updated_at timestamp without time zone NOT NULL,
      default_owner_uuid character varying(255),
 -    scopes text DEFAULT '---
 -- all
 -'::text NOT NULL,
 +    scopes text DEFAULT '["all"]'::text,
      uuid character varying(255) NOT NULL
  );
  
@@@ -1728,6 -1730,13 +1728,13 @@@ CREATE UNIQUE INDEX index_commits_on_re
  CREATE INDEX index_container_requests_on_owner_uuid ON container_requests USING btree (owner_uuid);
  
  
+ --
+ -- Name: index_container_requests_on_requesting_container_uuid; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+ --
+ 
+ CREATE INDEX index_container_requests_on_requesting_container_uuid ON container_requests USING btree (requesting_container_uuid);
+ 
+ 
  --
  -- Name: index_container_requests_on_uuid; Type: INDEX; Schema: public; Owner: -; Tablespace: 
  --
@@@ -1805,6 -1814,13 +1812,13 @@@ CREATE UNIQUE INDEX index_humans_on_uui
  CREATE INDEX index_job_tasks_on_created_at ON job_tasks USING btree (created_at);
  
  
+ --
+ -- Name: index_job_tasks_on_created_by_job_task_uuid; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+ --
+ 
+ CREATE INDEX index_job_tasks_on_created_by_job_task_uuid ON job_tasks USING btree (created_by_job_task_uuid);
+ 
+ 
  --
  -- Name: index_job_tasks_on_job_uuid; Type: INDEX; Schema: public; Owner: -; Tablespace: 
  --
@@@ -2036,6 -2052,13 +2050,13 @@@ CREATE INDEX index_logs_on_event_type O
  CREATE INDEX index_logs_on_modified_at ON logs USING btree (modified_at);
  
  
+ --
+ -- Name: index_logs_on_object_owner_uuid; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+ --
+ 
+ CREATE INDEX index_logs_on_object_owner_uuid ON logs USING btree (object_owner_uuid);
+ 
+ 
  --
  -- Name: index_logs_on_object_uuid; Type: INDEX; Schema: public; Owner: -; Tablespace: 
  --
@@@ -2752,8 -2775,12 +2773,15 @@@ INSERT INTO schema_migrations (version
  
  INSERT INTO schema_migrations (version) VALUES ('20170301225558');
  
 +INSERT INTO schema_migrations (version) VALUES ('20170319063406');
 +
  INSERT INTO schema_migrations (version) VALUES ('20170328215436');
  
  INSERT INTO schema_migrations (version) VALUES ('20170330012505');
 -INSERT INTO schema_migrations (version) VALUES ('20170419175801');
+ 
+ INSERT INTO schema_migrations (version) VALUES ('20170419173031');
+ 
+ INSERT INTO schema_migrations (version) VALUES ('20170419173712');
+ 
++INSERT INTO schema_migrations (version) VALUES ('20170419175801');
++