SAK-27928 merge 314034,314510 from trunk

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