Merge pull request #3969 from mikeller/fix_arming_for_gyro_calibration_on_arm