add jobmanager changes and (mostly) final cleanup
add jobmanager changes and (mostly) final cleanup

pranjan77/narrative,kbase/narrative,briehl/narrative,pranjan77/narrative,briehl/narrative,pranjan77/narrative,briehl/narrative,kbase/narrative,pranjan77/narrative,briehl/narrative,pranjan77/narrative,kbase/narrative,kbase/narrative,kbase/narrative,briehl/narrative,kbase/narrative,pranjan77/narrative,briehl/narrative,pranjan77/narrative,briehl/narrative