ENG-5321: Minor fixes related to elastic join and command log replay