Merge branch 'lock_active_features' of https://github.com/ProDrone/cleanflight into ProDrone-lock_active_features

Conflicts:
	src/test/unit/rc_controls_unittest.cc

src/main/io/serial_msp.c

@@ -1748,6 +1748,7 @@ void mspProcess(void)
                 delay(50);
             }
             stopMotors();
+            handleOneshotFeatureChangeOnRestart();
             systemReset();
         }
     }