Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Removed unnecessary refreshIndex from cpEntityManager.update()
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Updated pom.xml to properly include JSP servlet defs in web.xml on build
Fixes cleanup by moving de-index event to post complete results for consistent views.
Removed unused method and refresh
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
throw exception and don't throw null ref exception
separated ES from C* in cloudformation template/scripts
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into cloudformation-update
Temporary commit. Removes version checking.  Something is not quite right with our entity log writes.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Use EntityManager instead of EntityCollectionManager to repersist.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o

Conflicts:
	stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRepersistTest.java
Fixes issue with mixed case unique values