MSGCNTR-742 merge r117634 from trunk


git-svn-id: https://source.sakaiproject.org/svn/msgcntr/branches/msgcntr-3.0.x@122979 66ffb92e-73f9-0310-93c1-f5514f145a0a
MSGCNTR-805 merge r122957 from trunk


git-svn-id: https://source.sakaiproject.org/svn/msgcntr/branches/msgcntr-3.0.x@122980 66ffb92e-73f9-0310-93c1-f5514f145a0a