* tighter Class checking on merge operation
* hide TMA solution after converting to legs/standalone track
Merge pull request #617 from debrief/589_tidying

Further tidying to merge TMA tracks (associated with #589)