Fix for partial update error
merged upstream
update to partialUpdateTest
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Fixed tests in core, Query.addEqualityFilter, and partial update.
Initial hack to add batch operations to ES.  Needs some serious TLC when we have a bit of time.
First pass of changing cp and rm manager to use batches
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into esbatching

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
	stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
Updated batching calls
Merge remote-tracking branch 'amuramoto/2.0' into tempmerge
Updated naming scheme so that we can efficiently seek meta data by connection or collection suffix in graph
Cleaned up IndexScope so that is no longer has an impedance mismatch with the batch API.

Refactored edge naming for CP into it's own utility class

Moved categorization of edge types (collection|connection) into prefixes.  This will also type filtering in Cassandra when seeking edge types to populate meta data.
Removed obsolete test.
Fix to prevent infinite recursion in IndexRebuild.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o