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