user create v2.0 depends on tenantId in response

User create for v2.0 no longer always contains a tenantId in the
response. Add a guard to check for tenantId first before pop'ing it.

Change-Id: I428dbc26520bb86efad33768ce04f584217ad168
Closes-Bug: #1352119
Merge "user create v2.0 depends on tenantId in response"