Merge "Add additional zuul.conf information"