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