OpenNMS Development: jira-NMS-10439 (21.1.0-SNAPSHOT)