SAM-2269 merge 310350 to 10.x

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

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