Convert tabs to spaces
Merge pull request #338 from continuuity/feature/tabs-to-spaces

Convert tabs to spaces
replaced buggy lock test that relied on sleeps to try and ensure
a specific ordering of lock acquirement and release.
fix case where the zkmap has not yet loaded an additional key
and so we cant assume the value for the key exists.
Merge pull request #342 from continuuity/feature/fix-race-in-zkmap-test

fix case where the zkmap has not yet loaded an additional key
release lock in a finally.
Merge pull request #339 from continuuity/feature/fix-lock-test

replaced buggy lock test that relied on sleeps to try and ensure
Merge remote-tracking branch 'origin/develop' into feature/multitenancy-setting