Merge pull request #12067 from michaelmcandrew/CRM-21576-sms-permission-extra