A condiment conundrum that broke out over an apparent decision by Subway to stop serving yellow mustard at its restaurants in Canada seems to have ended with the return of the beloved condiment.