Z endstop mapping has changed as side effect of the upstream merge, so
it does no longer match the motor mapping.
Define SWAP_Z_MOTORS to resolve this issue without manipulation of the
upstream pin mapping.
Also use predefined mapping instead of custom overrides.