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