12708: Merge branch 'master' into 12708-balance-storage-classes

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --combined sdk/go/arvados/collection.go
index 8a8330abb5e3acd501dc8fa4e29ef2294d3fb9db,aea0cc043f40f6460feaa6ecc3f26408cdc54e18..79be2f3f1d27d515f03b166573fd3c3c5fb0eb9b
--- 1/sdk/go/arvados/collection.go
--- 2/sdk/go/arvados/collection.go
+++ b/sdk/go/arvados/collection.go
@@@ -15,22 -15,20 +15,23 @@@ import 
  
  // Collection is an arvados#collection resource.
  type Collection struct {
 -      UUID                   string     `json:"uuid,omitempty"`
 -      OwnerUUID              string     `json:"owner_uuid,omitempty"`
 -      TrashAt                *time.Time `json:"trash_at,omitempty"`
 -      ManifestText           string     `json:"manifest_text,omitempty"`
 -      UnsignedManifestText   string     `json:"unsigned_manifest_text,omitempty"`
 -      Name                   string     `json:"name,omitempty"`
 -      CreatedAt              *time.Time `json:"created_at,omitempty"`
 -      ModifiedAt             *time.Time `json:"modified_at,omitempty"`
 -      PortableDataHash       string     `json:"portable_data_hash,omitempty"`
 -      ReplicationConfirmed   *int       `json:"replication_confirmed,omitempty"`
 -      ReplicationConfirmedAt *time.Time `json:"replication_confirmed_at,omitempty"`
 -      ReplicationDesired     *int       `json:"replication_desired,omitempty"`
 -      DeleteAt               *time.Time `json:"delete_at,omitempty"`
 -      IsTrashed              bool       `json:"is_trashed,omitempty"`
 +      UUID                      string     `json:"uuid,omitempty"`
++      OwnerUUID                 string     `json:"owner_uuid,omitempty"`
 +      TrashAt                   *time.Time `json:"trash_at,omitempty"`
 +      ManifestText              string     `json:"manifest_text,omitempty"`
 +      UnsignedManifestText      string     `json:"unsigned_manifest_text,omitempty"`
 +      Name                      string     `json:"name,omitempty"`
 +      CreatedAt                 *time.Time `json:"created_at,omitempty"`
 +      ModifiedAt                *time.Time `json:"modified_at,omitempty"`
 +      PortableDataHash          string     `json:"portable_data_hash,omitempty"`
 +      ReplicationConfirmed      *int       `json:"replication_confirmed,omitempty"`
 +      ReplicationConfirmedAt    *time.Time `json:"replication_confirmed_at,omitempty"`
 +      ReplicationDesired        *int       `json:"replication_desired,omitempty"`
 +      StorageClassesDesired     []string   `json:"storage_classes_desired,omitempty"`
 +      StorageClassesConfirmed   []string   `json:"storage_classes_confirmed,omitempty"`
 +      StorageClassesConfirmedAt *time.Time `json:"storage_classes_confirmed_at,omitempty"`
 +      DeleteAt                  *time.Time `json:"delete_at,omitempty"`
 +      IsTrashed                 bool       `json:"is_trashed,omitempty"`
  }
  
  func (c Collection) resourceName() string {