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