USERGRID-1356: Ensure PUT (create) / DELETE / PUT (create) cycle works as intended for Devices