435.23 back-porting changes from G2 build 47.07; make new switch code in homing look like probing code