Merge "Add playbook support to simple_layout in tests" into feature/zuulv3