Pull request 597

[Keyur Karnik]

Hi all,
I need to get this PR merged into master. I have fixed all tests and some
bugs to ensure that the build compiles and tests correctly.

https://github.com/apache/usergrid/pull/597

Thanks,
Keyur