SAK-28051 Merge 315603 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-10.x@315652 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25944 Merge 315604 from trunk

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