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