Merge pull request #200 from apigee/USERGRID-2019

Added in fix for USERGRID-2019. Added test to confirm issue is fixed.
Merge branch 'master' of https://github.com/apigee/usergrid-stack into USERGRID-2019