SAK-22657 merge 307418 307420 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/sakai-10.x@308835 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-19397 merge 307401 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/sakai-10.x@308843 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-19924 merge 307395 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/sakai-10.x@308844 66ffb92e-73f9-0310-93c1-f5514f145a0a