Merge "Zuul references cleaner"