Merge "Clean up bad layout files in zuul tests"