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