Merge pull request #463 from jimis/3.3.x

Backported Mikhail's 3cec23f to 3.3.x.
Remove stale lines of non-existing tests.
Properly kill processes holding CFEngine locks (Redmine #2330)

Backport Mikhail's abf7f75e from master.