Merge branch 'master' into 9998-no-count-items-available

Conflicts:
	sdk/go/arvados/resource_list.go
	services/keep-balance/collection.go

diff --cc sdk/go/arvados/resource_list.go
index 2864307ebfa029024894b6fe4bdac3667f98fc73,242fb7e406542bda161a528519ea03f4f204db0e..0cc665807b17e4d5a9735c6bf1b7f4242ec08998
--- 1/sdk/go/arvados/resource_list.go
--- 2/sdk/go/arvados/resource_list.go
+++ b/sdk/go/arvados/resource_list.go
@@@ -5,13 -5,12 +5,14 @@@ import "encoding/json
  // ResourceListParams expresses which results are requested in a
  // list/index API.
  type ResourceListParams struct {
-       Select   []string `json:"select,omitempty"`
-       Filters  []Filter `json:"filters,omitempty"`
-       Limit    *int     `json:"limit,omitempty"`
-       Offset   int      `json:"offset,omitempty"`
-       Order    string   `json:"order,omitempty"`
-       Distinct bool     `json:"distinct,omitempty"`
-       Count    bool     `json:"count,omitempty"`
+       Select       []string `json:"select,omitempty"`
+       Filters      []Filter `json:"filters,omitempty"`
+       IncludeTrash bool     `json:"include_trash,omitempty"`
+       Limit        *int     `json:"limit,omitempty"`
+       Offset       int      `json:"offset,omitempty"`
+       Order        string   `json:"order,omitempty"`
++      Distinct     bool     `json:"distinct,omitempty"`
++      Count        bool     `json:"count,omitempty"`
  }
  
  // A Filter restricts the set of records returned by a list/index API.

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

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

diff --cc services/keep-balance/collection.go
index 060621b7715b55efd450d1753c57b296ef5d33fb,b3a631e979a77a78f6c7a8b60fd012e77b360368..15556ed61282ad551fd171af4efce2813dc69f04
--- 1/services/keep-balance/collection.go
--- 2/services/keep-balance/collection.go
+++ b/services/keep-balance/collection.go
@@@ -42,10 -43,10 +44,11 @@@ func EachCollection(c *arvados.Client, 
                limit = 1<<31 - 1
        }
        params := arvados.ResourceListParams{
-               Limit:  &limit,
-               Order:  "modified_at, uuid",
-               Count:  false,
-               Select: []string{"uuid", "manifest_text", "modified_at", "portable_data_hash", "replication_desired"},
+               Limit:        &limit,
+               Order:        "modified_at, uuid",
++              Count:        false,
+               Select:       []string{"uuid", "unsigned_manifest_text", "modified_at", "portable_data_hash", "replication_desired"},
+               IncludeTrash: true,
        }
        var last arvados.Collection
        var filterTime time.Time