resolves conflicts from cherry-picking tenant name url validation