Be more strict on which SNMP interfaces must be merged while running the upgrade tool
Fix for NMS-6275 - thresholdFilter is ignored if value is null, despite AND condition
Fix for NMS-6278 - Threshold filters based on numeric values are not working when they are not part of the expression or ds-name