5824: Merge branch 'master' into 5824-keep-web

diff --cc doc/_config.yml
index 6d0bdb2f28a01e0329b4b3ed80ec9f0326e02243,75cb997d78b0fe0d80d869023185a11dbfa0bfbd..2f37f5af0803c360f2c0cce2d08389d64b21249f
--- 1/doc/_config.yml
--- 2/doc/_config.yml
+++ b/doc/_config.yml
@@@ -153,8 -153,8 +153,9 @@@ navbar
        - install/install-shell-server.html.textile.liquid
        - install/create-standard-objects.html.textile.liquid
        - install/install-keepstore.html.textile.liquid
+       - install/configure-azure-blob-storage.html.textile.liquid
        - install/install-keepproxy.html.textile.liquid
 +      #- install/install-keep-web.html.textile.liquid
        - install/install-crunch-dispatch.html.textile.liquid
        - install/install-compute-node.html.textile.liquid
      - Helpful hints:

diff --cc sdk/go/keepclient/keepclient.go
Simple merge

diff --cc sdk/go/keepclient/support.go
Simple merge

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

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