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