Wait for initial baro offset calculation before calculating average.
Merge branch 'sonar_alt' into iarc2014_sonar