Merge "Merger: Stop storing zuul references"