Switched properties to now use the correct entry in the properties file.
Fixed issue and added onto previous test so that the issue can be tested.
Merge branch 'pr/29'
Merge branch 'pr/30'
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into add-metrics
Fixes tests to be clearer