SAM-2396 merge 312704 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@313726 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2365 merge 311135 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@313730 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2383 merge 312279 to 10.x

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