OpenNMS Development: NMS-4433 (18.0.0-SNAPSHOT)