Merge branch 'master' into 13937-keepstore-prometheus

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

diff --cc services/keepstore/azure_blob_volume.go
Simple merge

diff --cc services/keepstore/handler_test.go
Simple merge

diff --cc services/keepstore/handlers.go
Simple merge

diff --cc services/keepstore/keepstore.go
Simple merge

diff --cc services/keepstore/volume_test.go
Simple merge