Merge remote-tracking branch 'upstream/master' into linux

Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Conflicts:
	src/modules/commander/gyro_calibration.cpp
	src/modules/mavlink/mavlink_ftp.cpp

src/modules/sdlog2/sdlog2.c

@@ -1982,10 +1982,10 @@ void handle_command(struct vehicle_command_s *cmd)
 		if (param == 1)	{
 			sdlog2_start_log();
 
-		} else if (param == 0)	{
+		} else if (param == -1)	{
 			sdlog2_stop_log();
 		} else {
-			warnx("unknown storage cmd");
+			// Silently ignore non-matching command values, as they could be for params.
 		}
 
 		break;