Added a test for USERGRID-1919.
Merge branch 'master' into USERGRID-1919_TEST
Removed unused code in test.

USERGRID-1919
Merge pull request #186 from apigee/USERGRID-1919_TEST

Usergrid 1919 test