Added in fix for USERGRID-2019. Added test to confirm issue is fixed.