Copter: merge WPNAV into NTUN dataflash message
Copter: compiler fix for disabled logs