Merge "Log a warning when zuul.conf is misconfigured"