OpenNMS Development: jira-NMS-8853 (18.0.3-SNAPSHOT)