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