Merge "Move test_tags to simple_layout" into feature/zuulv3