Merge "Removal of deprecated argument[os-tenant-name]"