OpenNMS Development: jira-HZN-1249-cleanup (22.0.0-SNAPSHOT)