OpenNMS Development: jira-NMS-10477-2 (21.1.0-SNAPSHOT)