Merge "Support custom playbook locations" into feature/zuulv3