OpenNMS Development: jira-NMS-8331-NMS-8332 (18.0.1-SNAPSHOT)