test fixes
Merge branch 'two-dot-o' into two-dot-o-events

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityCollectionManager.java
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
Merge branch 'pr/92' into two-dot-o-events.  This closes #92

Conflicts:
	stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
Fixes to StaleEntityCleapupTest, which is looking good now, also some import cleanups.
Merge branch 'two-dot-o-events' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-events

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o-events' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
  Fixes to StaleEntityCleapupTest, which is looking good now, also some import cleanups.
  test fixes

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityCollectionManager.java
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java