SAK-23733 merge r126908,126997,127666 from trunk

git-svn-id: https://source.sakaiproject.org/svn/edu-services/branches/edu-services-1.2.x@127788 66ffb92e-73f9-0310-93c1-f5514f145a0a