AP_NavEKF & DataFlash: Update to 22 state filter and additional flash logging
DataFlash: fixed build
Copter: fixed non-EKF copter build
DataFlash: fixed merge error
AP_NavEKF: fixed merge error that inverted static mode
Dataflash: fixed merge errors on gyro bias  & EKF4 logging
AP_NavEKF: changed sqrt to sqrtf