Pelrad,
I actually requested Famous Flower of Servingmen, and Seven Yellow Gypsies (my husband was at the time absorbed in learning to play the latter) at the Mystic Sea Music Festival in 2002; the lyrics Martin sang that night are the same ones I've always heard.
D.