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