Merge "Switch to yaml.safe_load" into feature/zuulv3