Merge "Re-enable test_layered_templates test" into feature/zuulv3