USERGRID-1837: sync recent iOS push changes for device id
Merge pull request #1 from apigee/usergrid-1837

USERGRID-1837: sync recent iOS push changes for device id