Merge pull request #11470 from twomice/CRM-18300_correct_hardcoded_profile_names