SAM-2392 merge 314040 from trunk

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@315258 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2260 merge 314035 from trunk

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