Merge "Add phase and count to variables passed in to playbooks" into feature/zuulv3