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