patch waffle to add deployment specific suffixes (bug 886987)