Fix NMS-6313: IPv6 IPLIKE expressions incorrectly rejected in notification wizard
fix data collection config updates
Merge remote-tracking branch 'origin/1.12' into jira/NMS-6314