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