Refactor job manager to isolate explicit references to job type

Change-Id: I9b5433832b1c9c2a6a78aa8322cb10a6ba146c88
Merge "Refactor job manager to isolate explicit references to job type"