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