Minor formating.
Merge branch 'two-dot-o' into optimistic-tx-semantics
First stab at optimistic verification
Merge branch 'two-dot-o' into optimistic-tx-semantics
Progress on optimistic verify and test.
Merge branch 'two-dot-o' into optimistic-tx-semantics

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
shell of a WriteOptimisticVerifyTest now in place, but it does not really test anything.
Merge branch 'two-dot-o' into optimistic-tx-semantics

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
Separate WriteOptimisticVerify test into to parts, one Theories part and one Jukito part.
Use mocks instead of real live serialization strategy.
Merge branch 'two-dot-o' into optimistic-tx-semantics

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
	stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/guice/TestCollectionModule.java
Fix broken test.
Operation specific exception types.
We now cleanup and unique values on version conflict; also, added better tests for optimistic and unique verification.
Operation now removes self from log instead of writing a rollback entry.
New RollbackAction and exception handling changes.
Merge branch 'two-dot-o' into optimistic-tx-semantics

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteOptimisticVerify.java
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java
	stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/EntityBuilder.java
	stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/legacy/EntityManagerFacade.java
	stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/EntityBuilder.java
	stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityCollectionIndexTest.java
	stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/legacy/EntityBuilder.java
Rollback of MVCC log and UniqueValues now working and verified by test.
Merge branch 'two-dot-o' into optimistic-tx-semantics

Conflicts:
	stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/legacy/EntityManagerFacade.java
Merge branch 'two-dot-o' into optimistic-tx-semantics

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