Merge branch 'integration_merge_connstatus' of github.com:Susurrus/qgroundcontrol into integration_merge_connstatus