Comment 16 for bug 1267431

This was reverted here: https://review.openstack.org/#/c/74823/
However I can't reproduce any issue with another tenant name. Instances are created and removed just fine, openrc file is updated with right tenant info.