Merge "Fix error handling for pidfile" into feature/zuulv3