SAM-2065 Merge 315710 from trunk

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

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

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