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