OpenNMS Development: ranger-merge-2017-and-21-to-develop (22.0.0-SNAPSHOT)