SAK-27734 merge r311224,311225 from trunk


git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@314262 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27904 merge r314032 from trunk


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