ENG-4686 tweaks in message handling and FailureSiteUpdateMessage matchers