OpenNMS Development: jira-HZN-1473 (17.0.1-SNAPSHOT)