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