Revert various sonar and baro related changes.
Merge branch 'sonar_alt' into iarc2014_sonar