Merge "Add simple_layout test decorator" into feature/zuulv3