Werror fix

@LorenzMeier 
These changes allow me to compile with the latest mavlink headers

The change in commander was required for master with normal mavlink as well.