Merge "Update deprecated use of yaml.load"