Merge "Use scheduler-specific log config and pidfile" into feature/zuulv3