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