fix kill request for invalid jobs; add tests
Merge branch 'ff' into kbase-dev