OpenNMS Development: jira-NMS-7965 (18.0.0-SNAPSHOT)