Merge branch 'USERGRID-575' of https://github.com/apache/incubator-usergrid