OpenNMS Development: NMS-7820 (18.0.0-SNAPSHOT)