Merge branch 'master' into 6260-test-datamanager

Conflicts:
	services/keepstore/keepstore.go

diff --cc services/keepstore/keepstore.go
index a79a401e71d82f40bcee38cd5a9eb6ebb3fa09df,c4a12c5a5c44a9af5ca2360e70fe9ccdf961a330..ec11af5cf51c8c1a65bdf4827962a74aa90a03fe
--- 1/services/keepstore/keepstore.go
--- 2/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@@ -347,13 -347,8 +347,13 @@@ func main() 
                        log.Fatalf("reading data manager token: %s\n", err)
                }
        }
-       if never_delete != true && data_manager_token != TEST_DATA_MANAGER_TOKEN {
 +
-       if blob_signing_key_file != "" {
-               if buf, err := ioutil.ReadFile(blob_signing_key_file); err == nil {
++      if neverDelete != true && dataManagerToken != TEST_DATA_MANAGER_TOKEN {
 +              log.Fatal("never_delete must be true, see #6221")
 +      }
 +
+       if blobSigningKeyFile != "" {
+               if buf, err := ioutil.ReadFile(blobSigningKeyFile); err == nil {
                        PermissionSecret = bytes.TrimSpace(buf)
                } else {
                        log.Fatalf("reading permission key: %s\n", err)