OpenNMS Development: jira-NMS-9818 (21.0.3-SNAPSHOT)