Use waffles switches and fxa settings provided by zamboni if present (bug 1093584)

https://bugzilla.mozilla.org/show_bug.cgi?id=1093584
I thought we did, but it seems that we don't actually.