OpenNMS Development: jira-NMS-8428 (17.0.1-SNAPSHOT)