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