KNL-1195 merge r306861 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@307310 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1099 merge r306379 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@307311 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1189 merge r306903 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@307312 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1191 merge r306722 to 10.x

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