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