Merge "Change AlertSeverity to Severity in policy/engine"