OpenNMS Development: jira-HZN-638 (18.0.0-SNAPSHOT)