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