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

Change-Id: Ida9bc04031e043311fa8c5bd6b3bbb75eb64106c