Making sure that LHM will retry the atomic switch on lock wait timeouts

Making sure other MySQL errors are NOT retried

Syncing the test

Have a finite amount of retries then give up

Preventing possible raceiness

fix broken spec