OpenNMS Development: jira-NMS-9667 (21.0.5-SNAPSHOT)