Alphabetize vehicle type logic block order and Update param set MAV_TYPE  logic to only set the parameter if no MAV_TYPE was previously set.