Import clean-up and formatting only.
Rename getMapManager() to createMapManager() for consistency with other CP managers.
Formatting and import cleanup only.
Use new Core Persistence Map Module to look up Entity Types by UUID (from Cassandra) instead of relying entirely on the Query Index module (and ElasticSearch).
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o

Conflicts:
	stack/core/pom.xml
	stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceModule.java