Merge "Make jobs to release the file locks when they end up with a bootup-err." am: a0c5185e am: 02731822 am: 10163ca2 Change-Id: I42096cec3cb5dadd3b8858fba79a25bff1363a56