SAK-23544 merge r123335,123788 from trunk


git-svn-id: https://source.sakaiproject.org/svn/edu-services/branches/edu-services-1.2.x@129015 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23570 merge r123501 from trunk


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