SAM-2417 merge 314980 from trunk

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@315391 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2033 Merge 311582,315375 from trunk

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