Fix merge issues

This reverts commit 52160d80.

Fixed inverse logic in camera parameter retry count
Skip close timeout if not Windows

Pulling mavlink with a reversal for the CAMERA_IMAGE_CAPTURED message. It's now back as it was so it won't break existing code.
The pull also brought changes to the GPS_RAW_INT message. Only MockLink uses. I entered zeros for all new fields.

No signing support yet