OpenNMS Development: revert-737-jira-HZN-688 (18.0.0-SNAPSHOT)