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