OpenNMS Development: jira-NMS-8450 (18.0.1-SNAPSHOT)