OpenNMS Development: jira-NMS-8204-cpape (17.0.1-SNAPSHOT)