Merge "Fix verify_tempest_config to not leak a tenant"