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