OpenNMS Development: jira-NMS-9721-f17-fix (19.0.0-SNAPSHOT)