SAK-24427 merge 308064 308484 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/reset-pass/branches/sakai-10.x@308859 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26115 merge 308245 308249 to 10.x

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