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