Reordered the configuration for servos and auto-bed-levelling to allow PROBE_SERVO_DEACTIVATION_DELAY to be dependent on SERVO_ENDSTOPS, as it should be.
Placing servos and auto-bed-levelling below the other mechanical settings also seems to be a more consistent order.