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