…sf/usergrid into release-2.1.1

# Conflicts:
#	stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java

…t the data object within the SDK instead of just adding key/value pairs.

…sf/usergrid into release-2.1.1

…d Schedulers.io()

….1.1

…h other tests yet, and added the counters to the backend of notifications for further examination.

…release-2.1.1

…release-2.1.1

…sf/usergrid into release-2.1.1

…/heap.

…xing to be /_index instead of /_indexes

…re work is needed.

…est.

…s" and _indexes to _settings.

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/index/CollectionSettingsCacheImpl.java
	stack/rest/src/main/java/org/apache/usergrid/rest/applications/CollectionResource.java
	stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java

…U.V. performance test like the one in the POC.

…ties file.

…ng and consuming leverage the same cache.

…rrent notifiers are stored as a hash map within the class instance).

* release-2.1.1: (23 commits)
  Add more info to the log statement when we can't load an application.
  Update logging statements to be trace level.
  Clear an app's push manager queue cache when notifiers are added ( current notifiers are stored as a hash map within the class instance).
  Re-work caching of push notification queue managers such that producing and consuming leverage the same cache.
  Ensure the hector cluster is created with credentials from the properties file.
  Added fixes around caching and changed the endpoint to selective indexing to be /_index instead of /_indexes
  Tweak heap status to return used heap, and changed endpoint to status/heap.
  Add status/memory endpoint to get heap usage, max heap, and free heap.
  Increase limit of device fetching per user to 50.
  Increase AWS client timeouts.
  Back to Schedulers.io()
  Update distinct to properly use device ID.
  Update distinct code.
  Fix scheduler.
  Temporarily disable notification counters and back to Schedulers.io()
  Fix NPE.
  Added a test for counters that isn't correctly configured to work with other tests yet, and added the counters to the backend of notifications for further examination.
  Add a separate executor pool for async processing instead of unbounded Schedulers.io()
  Invalidate ShiroCache when admin user added to org.
  Ensure that applicationId cache does not cache nulls.
  ...

…agrant VMs

…gging of Cassandra props to ToolBase

…ion.

…RuntimeException

…tances of the class cast exception

…ue will no longer occur.

… initializing mgmt app on database/bootstrap.

Added additional assert to make sure that a POST will not encounter this issue as well.

…less of roles/permissions, also that it is impossible to create an app or admin user named 'me'

…sf/usergrid into release-2.1.1

… used once for guaranteed longs.

…ergridRequest.

…updates.

Also added the generated jar artifact to the repo.

Added default constructors to some classes.
Added @JsonProperty annotations to some constructor methods.
Added UsergridEntity.toPrettyString() for constructing a pretty printed Json string.
Fixed UsergridResponse.fromException method to check for null.

…sf/usergrid into release-2.1.1

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java

…with retries, and caching for the management app itself.

…ure that manager app is always available.

Should be no reason to use a retry loop because the system will continue to call for EntityManagers.
Adds new "entity.manager.cache.size" property, which defaults to 100.

…app-init

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java

…ested fields)

…sf/usergrid into release-2.1.1

…grid

…grid

…tion in RuntimeException"

This reverts commit 6b195a0.

…application."

This reverts commit 223521e.

Conflicts:
	stack/services/src/main/java/org/apache/usergrid/services/ServiceManager.java

…nagerFactory, also ASL header in CassandraCluster

… entity manager factory, also better error logging.