Merge branch '18321-gpu-instancetype' refs #18321

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --cc lib/config/config.default.yml
Simple merge

diff --cc lib/config/export.go
Simple merge

diff --cc lib/config/generated_config.go
Simple merge

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

diff --cc services/api/app/models/arvados_model.rb
Simple merge

diff --cc services/api/app/models/container_request.rb
Simple merge