Fixes to CorePersistenceIT and index impl.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Fixes to CorePersistenceIT and index impl.

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