SAK-27800 merge 312138, 312139, 312140, 312141, 312142, 312144, 312145, 312146, 312147, 312148 from trunk

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