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