Merge "Implements use of yaml.safe_load as per sec audit"