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