SAK-27782 merge 311710, 311727 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel@313704 66ffb92e-73f9-0310-93c1-f5514f145a0a