Remove PID file after calling onStop
Merge pull request #3274 from gmethvin/server-stop-pid-file

Remove PID file after calling onStop