OpenNMS Development: revert-907-jira-NMS-8370 (18.0.1-SNAPSHOT)