OpenNMS Development: jira-HZN-1338 (23.0.0-SNAPSHOT)