simplify slave selection during failsafe in master client.  integration tests working again.