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