0c05a35
- be more careful about taking a lock on the pidfile, and don't modify it if we fail somehow (more of #596719)