Merge "Fix Zuul warnings"