SAK-27922 merge r313782,313788 from trunk


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