SAK-26057 merge 307904 308144 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/help/branches/sakai-10.x@308822 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26086 merge 308145 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/help/branches/sakai-10.x@308823 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25986 merge 308298 to 10.x

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