fix for bug 1358109 - [1.11-2301] Admin tenant not created during provisioning.

Change-Id: I400813f6db1dbee007a46fcec1c06dc71c5b013e
Merge " fix for bug 1358109 - [1.11-2301] Admin tenant not created during provisioning." into R1.10