Revert my test back to GuiceBerry.
Ensure test results match spec in https://apigeesc.atlassian.net/browse/USERGRID-2774
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o
Fixes to get Oracle JDK installation to work.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o

Conflicts:
	stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/changelog/ChangeLogGeneratorImplTest.java