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