Identity Rewrite of clients required smoke tests to be rewritten.

Change-Id: I5ceef8710f5370af55998c3d603e1b02c150e764
Merge "Identity Rewrite of clients required smoke tests to be rewritten."