Another cleanup round
Merge branch 'config' of github.com:mavlink/qgroundcontrol into config
Post-merge cleanup