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