OpenNMS Development: jira-NMS-9002 (18.0.4-SNAPSHOT)