A dispute between HMRC and EY over their tax work for property developer Jamie Ritblat has been settled before it headed to trial