Generalized add_admin_to_tenant
Add workaround for Packstack Heat bug

This should fix the Heat tests complaining about a non-existing role.