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