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