I would have thought it means "I wish you well" which applies in both of those though more in the "goodbye" case.

this is an interesting point. perhaps then the original meaning covered goodbye and it's drifted towards mostly meaning thank you, but then there's some drift back towards goodbye? god but language is complicated though. undoubtedly I'm wrong and it's far more complex