Merge "tempest cleanup - use admin_mgr only"