OpenNMS Development: jira-NMS-9661 (21.0.0-SNAPSHOT)