Use only baro_corr to correct baro offset when using sonar for alt.
Merge branch 'sonar_alt' into iarc2014_sonar