Further fixes for Muon TSOS sorting
This simplifies the attempt to provide a fix for the rare cases in which sorting puts calo deposits at the end of the track hit list by just requiring that MS hits are always placed after calo deposits. Otherwise, the hit sorting should be left unchanged. This will fix some problems with muon reconstruction that are also showing up in the crashes documented in ATLASRECTS-4909 and hopefully also ATLASRECTS-4920.