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