For ENG-6588, fix more binary log shipping bugs