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