Merge "tox: remove validate-layout" into feature/zuulv3