Clean up imports
Sometimes the jobs age out, ignore.
Log rather than fail, if a job could not be stopped
Merge branch 'feature/Broken_cleanup' into develop

* feature/Broken_cleanup:
  Log rather than fail, if a job could not be stopped
  Sometimes the jobs age out, ignore.
  Clean up imports