Merge remote-tracking branch 'origin/master' into 2075-workbench-paging

Conflicts:
	services/api/app/controllers/arvados/v1/schema_controller.rb

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

diff --cc services/api/app/controllers/arvados/v1/schema_controller.rb
index 23706afeed93c189e7558ce8f6519e55f507e590,dde592ee8aa16dcbbf2bbe3b25722d38e607648d..f02a56bc62fb19274cc390643f4a232b76fb7be3
--- 1/services/api/app/controllers/arvados/v1/schema_controller.rb
--- 2/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@@ -222,13 -222,10 +222,18 @@@ class Arvados::V1::SchemaController < A
                    minimum: 0,
                    location: "query",
                  },
 +                offset: {
 +                  type: "integer",
 +                  description: "Number of #{k.to_s.underscore.pluralize} to skip before first returned record.",
 +                  default: 0,
 +                  format: "int32",
 +                  minimum: 0,
 +                  location: "query",
++                  },
+                 filters: {
+                   type: "array",
+                   description: "Conditions for filtering #{k.to_s.underscore.pluralize}.",
+                   location: "query"
                  },
                  where: {
                    type: "object",