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

https://bugzilla.mozilla.org/show_bug.cgi?id=1093584
I like to do the visual line-up indent, even if it matches with the body of the block.