ENG-4686 ENG-4861 better handling of agreement stale messages