SAK-28027 Merge 315015, 315168 from trunk

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