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