Merge remote-tracking branch 'origin/master' into buildWork

* origin/master:
  Fix compiler warnings
  MockLink Start/Stop to Preferences
  Use vehicle count instead of link count
  Fix compiler warning
  Centralize unit test declaration location
  Add --unittest-stress support

Conflicts:
	QGCApplication.pro