Fix merge issues

* cameraControl: (51 commits)
  Debug info
  Adding support for custom value.
  Parse min, max, step and unit off camera definition file Ignore Fact index if there are no enums (avoid adding an "Unknown" entry) Add function to convert and clamp a (Fact) value.
  Adding support for booleans Adding some more logging
  Keep asking for capture status while camera is not idle.
  Define how long to wait for RTSP frame before deciding the link is gone.
  Toggle video stream full screen
  Enable/Disable Offline maps import/export.
  Vehicle UID
  Handle capture status retries when capturing images. Allow plugin to validate parameter setting.
  Keep track of photo status (image capture) Don't allow "Take Photo" is status is not idle. Handle In Progress response (basically, do nothing) Request capture status when stopping video recording.
  For whatever reason, showing the dialog through a function causes a crash in QML (undebugable--new word!)
  Revert "Build fix due to MAVLink update."
  Revert "MAVLink signing (WIP)"
  Make custom dialog into a function Internet available now has a signal
  Wait a bit between reset and request parameters
  Build fix due to MAVLink update.
  MAVLink signing (WIP)
  Fixing uninitialized variable warning.
  Make slots protected instead of private.
  ...

# Conflicts:
#	src/FirmwarePlugin/FirmwarePlugin.cc
#	src/FlightDisplay/FlightDisplayView.qml
#	src/FlightDisplay/FlightDisplayViewVideo.qml
#	src/MissionManager/MissionManager.cc
#	src/Vehicle/Vehicle.cc
#	src/Vehicle/Vehicle.h
#	src/api/QGCCorePlugin.h

Update joystick mapping database

Make FTP more robust

Move to Qt 5.9.1

Assume all vehicles support MANUAL_CONTROL

If there are dropped packets during a burst download, the offsets and sizes
of the missing chunks are stored in a queue, and after the burst is
completed, they're requested individually.

This stores the last request and resends it after a timeout, with a max
of 6 retries.
It also checks for old incoming packets and drops them.

PX4 Firmware add DO_SET_ROI

Fix sub frame parameter download text overflow

Fix text overflow on sub safety page

Allow user-selectable brand image

Add ROV flightmap image for Sub to differentiate from boat.

Ignore Fact index if there are no enums (avoid adding an "Unknown" entry)
Add function to convert and clamp a (Fact) value.

Add basic KML functionality

Guided takeoff

Adding some more logging