Always cleanup pid files on exit/abort.
Merge branch 'refs/heads/master' into 2.3.x-dev