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