Merge "Consolidate irrelevant-files in zuul config"