10666: Merge branch 'master' into 10666-report-version

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

diff --cc services/crunch-run/crunchrun.go
Simple merge

diff --cc services/keep-web/handler.go
Simple merge

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

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