Merge "Remove excess debugging from playbook prep" into feature/zuulv3