Fix for Bug NMS-4056
NMS-5750 fix null dpname in event header
a little cleanup of things I ran into while working on NMS-5750
NMS-5750 fix null dpname in event header
Merge remote-tracking branch 'origin/1.10' into rc/unstable/1.11.90
Merge remote-tracking branch 'origin/rc/unstable/1.11.90' into 1.12