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