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