Changes to allow CpEntityManager to work with new IndexScope stuff.
Merge branch 'index-scope-updates' of https://github.com/usergrid/usergrid into index-scope-updates

Conflicts:
	stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
	stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/CandidateResult.java