Created test to prove issue.

USERGRID-1906
Fixes issue

USERGRID-1906
Fixed issue with email identifier edge case.

USERGRID-1906
Reverted changes to Query.  The functionality cannot be split due to legacy mapping.

USERGRID-1906
Merge pull request #185 from apigee/USERGRID-1906

Usergrid 1906
Merge branch 'master' into USERGRID-1919_TEST
Removed unused code in test.

USERGRID-1919