git.arvados.org - arvados.git/commit

Merge branch 'master' into 9998-unsigned_manifest

Conflicts:
services/api/app/models/collection.rb
services/keep-balance/collection.go

sdk/go/arvados/collection.go	diff1 \|	diff2 \|	blob \| history
services/api/app/controllers/arvados/v1/collections_controller.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/models/collection.rb	diff1 \|	diff2 \|	blob \| history
services/api/test/functional/arvados/v1/collections_controller_test.rb	diff1 \|	diff2 \|	blob \| history
services/keep-balance/collection.go	diff1 \|	diff2 \|	blob \| history