Merge "Make zuul-merger default pidfile match init script"