revert waffle module, add site config module for switches/fxa (bug 1038936)