OpenNMS Development: CERN-NMS-9766-backport (20.0.1)