OpenNMS Development: revert-708-jira-NMS-8302 (18.0.0-SNAPSHOT)