17170: Merge branch 'master'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --cc lib/crunchrun/crunchrun.go
Simple merge

diff --cc sdk/go/arvados/container.go
Simple merge

diff --cc services/api/test/unit/container_test.rb
Simple merge