Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
	stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java