Merge branch 'master' into 7478-anm-spot-instances

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

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

diff --cc services/nodemanager/arvnodeman/computenode/driver/azure.py
Simple merge

diff --cc services/nodemanager/arvnodeman/config.py
Simple merge

diff --cc services/nodemanager/arvnodeman/launcher.py
Simple merge

diff --cc services/nodemanager/arvnodeman/test/fake_driver.py
Simple merge