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