Fix for remaining Core module tests and removing some redundant tests.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into USERGRID-165_fix-exports-tests

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Fix for remaining Core module tests and removing some redundant tests.

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java