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