Merge pull request #10871 from mattwire/CRM-21078_message_template_form