Merge branch 'two-dot-o' into optimistic-tx-semantics

Conflicts:
	stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/legacy/EntityManagerFacade.java