Merge "Remove implied playbook extensions" into feature/zuulv3