Updated to support OpenNMS 1.12.6