Merge pull request #17862 from colemanw/jobCleanup