CLOUDSRV-2211 Eliminate dependency between Push and device and user registration / CLOUDSRV-2447 update on ti.cloud

conflict fix with pull-43