OpenNMS Development: jira-NMS-8908-nullcheck (14.0.3-SNAPSHOT)