AP_NavEKF: fixed merge error stopping EKF4 logging