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