KNL-1051 merge trunk r122144, per A Zeckoski accepted trunk version for all conflicts (tc option)

git-svn-id: https://source.sakaiproject.org/svn/user/branches/sakai-2.9.x@122991 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22618 merge trunk r122137

git-svn-id: https://source.sakaiproject.org/svn/user/branches/sakai-2.9.x@123002 66ffb92e-73f9-0310-93c1-f5514f145a0a