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