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