Merge "deprecate use of tenant in configs"