job management working and fit to demo

Change-Id: Ib437430ca6ffe51b653fc91a35e13c5e95b5f71e