Merge branch 'GERey-DPS-879-sqs-timeouts-impl' into refactor

Conflicts:
	stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/consistency/AsyncProcessorTest.java