SAK-27824 merge 312278, 315157 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-10.x@315235 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27838 merge 314049 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-10.x@315236 66ffb92e-73f9-0310-93c1-f5514f145a0a
"SAK-26628

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