OpenNMS Development: jw-jira-NMS-12222 (21.1.0-SNAPSHOT)