Tidy BatonManagerTest
Merge remote-tracking branch 'origin/8.34'