SAK-22629 merge r120195 from trunk with manual conflict resolution

git-svn-id: https://source.sakaiproject.org/svn/jobscheduler/branches/jobscheduler-2.9.x@127153 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22696 merge r120201 from trunk

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