SAM-2440 Merge 315708 from trunk

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@315723 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2438 Merge 315709 from trunk

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