OpenNMS Development: revert-1274-jira-NMS-8330 (18.0.4-SNAPSHOT)