OpenNMS Development: revert-735-jira-NMS-7854 (17.0.1-SNAPSHOT)