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