Merge branch 'USERGRID-1113' into USERGRID-810
Updated EncryptionService to be more compatible with import process.

Updated management import to take CredentialsInfo so import processes
can create CredentialsInfo as needed. 

USERGRID-810
Upgraded lock system to create lock instances so that they can be
shared.

Added hector lock based reentrant locks

USERGRID-1127
Changed no-op lock package.

Made hector locks the new default

USERGRID-1120
Updated locks to include path.  Values are serialized to a hex string.

If the value is null, a no-op lock is returned when the lock is a lock
on a value, since setting a value to null should cause no locks on
unique updates.

USERGRID-1120
Added zookeeper back with new lock structure

USERGRID-1120
Replaced cages with curator

USERGRID-1120
Changed default lock to be single node

USERGRID-1127
added overloaded forms to enable arbitrary admin user properties (via JSON only) as specified in USERGRID-1146
reference dynamicProperties directly when contructing UserInfo. For USERGRID-1146
Fixed issue with incorrect string constant in SHA command for legacy support
Merge pull request #235 from apigee/USERGRID-1113

Fixed issue with incorrect string constant in SHA command for legacy sup...
Updated per PR comments

USERGRID-1127
Added sensible defaults to zookeeper impl

Audited all uses of lock for try/finally

USERGRID-1127
Added examples of different lock configs

USERGRID-1127
Merge pull request #236 from apigee/USERGRID-1127

Usergrid 1127
removed owner and owner_type properties from core schema per USERGRID-1069
quick update to pom for making powermock work correctly with jdk1.7; adding into USERGRID-1069 for convinience
Merge pull request #237 from apigee/USERGRID-1069

Usergrid 1069
Merge branch 'master' into USERGRID-810