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