SAK-27575 merge 311049, 315416 from trunk

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