Merge "Fix 'jobscheduler run' shell command" into oc-dev