Adding fixes from master to nei branch by creating a new commit

sql/message_templates/grant_approved_html.tpl

sql/message_templates/grant_approved_subject.tpl

sql/message_templates/grant_approved_text.tpl

sql/message_templates/grant_awaiting_info_html.tpl

sql/message_templates/grant_awaiting_info_subject.tpl

sql/message_templates/grant_awaiting_info_text.tpl

sql/message_templates/grant_eligible_html.tpl

sql/message_templates/grant_eligible_subject.tpl

sql/message_templates/grant_eligible_text.tpl

sql/message_templates/grant_ineligible_html.tpl

sql/message_templates/grant_ineligible_subject.tpl

sql/message_templates/grant_ineligible_text.tpl

sql/message_templates/grant_paid_html.tpl

sql/message_templates/grant_paid_text.tpl

sql/message_templates/grant_payment_check_html.tpl

sql/message_templates/grant_payment_report_html.tpl

sql/message_templates/grant_submitted_html.tpl

sql/message_templates/grant_submitted_text.tpl

sql/message_templates/grant_withdrawn_html.tpl

sql/message_templates/grant_withdrawn_subject.tpl