Merge "Move playbook out of zuul" into feature/zuulv3