Fix issue where job name was being used instead of ID for identifying jobs.
Merge chanes.