MSND-76 merge trunk r118110

git-svn-id: https://source.sakaiproject.org/svn/mailsender/branches/1.7@122036 66ffb92e-73f9-0310-93c1-f5514f145a0a