Dataflash: fixed merge errors on gyro bias  & EKF4 logging