SAM-2304 merge r307094 to 10.x

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

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