Merge branch 'master' into 6260-test-datamanager

Conflicts:
	services/keepstore/keepstore.go

diff --cc services/keepstore/keepstore.go
index 593035717bf65f041327a7d14209277d6338d231,9c84534a02430acc4fc3fac632980c1201891b4f..a79a401e71d82f40bcee38cd5a9eb6ebb3fa09df
--- 1/services/keepstore/keepstore.go
--- 2/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@@ -26,25 -27,22 +27,26 @@@ import 
  
  // Default TCP address on which to listen for requests.
  // Initialized by the --listen flag.
- const DEFAULT_ADDR = ":25107"
+ const DefaultAddr = ":25107"
  
  // A Keep "block" is 64MB.
- const BLOCKSIZE = 64 * 1024 * 1024
+ const BlockSize = 64 * 1024 * 1024
  
- // A Keep volume must have at least MIN_FREE_KILOBYTES available
+ // A Keep volume must have at least MinFreeKilobytes available
  // in order to permit writes.
- const MIN_FREE_KILOBYTES = BLOCKSIZE / 1024
+ const MinFreeKilobytes = BlockSize / 1024
  
- // However, allow it to be false in testing.
 +// Until #6221 is resolved, never_delete must be true.
- var PROC_MOUNTS = "/proc/mounts"
++// However, allow it to be false in testing with TEST_DATA_MANAGER_TOKEN
 +const TEST_DATA_MANAGER_TOKEN = "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h"
 +
+ // ProcMounts /proc/mounts
+ var ProcMounts = "/proc/mounts"
  
- // enforce_permissions controls whether permission signatures
+ // enforcePermissions controls whether permission signatures
  // should be enforced (affecting GET and DELETE requests).
  // Initialized by the -enforce-permissions flag.
- var enforce_permissions bool
+ var enforcePermissions bool
  
  // blob_signature_ttl is the time duration for which new permission
  // signatures (returned by PUT requests) will be valid.