SAK-26107 merge 309158 309159 309161 309162 309164 309165 309166 309167 309168 to 10.x

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