SAM-1709 merge 306217 307251 307255 307560 307565 to 10.x

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