Changed error to warning
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into two-dot-o

Conflicts:
	stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/consistency/AsyncProcessorImpl.java