SAK-21836 merge trunk r120197,120200

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