- 
Francis Li authored* op-conductor: fix ha test flakiness * 3rd try * 4th try * 1st try with everything ready * 2nd try * 3rd try * 4th try 5e0dc463
* op-conductor: fix ha test flakiness * 3rd try * 4th try * 1st try with everything ready * 2nd try * 3rd try * 4th try