Bug 823783: keep wifi hardware and wifi setting in sync
Merge pull request #7601 from davidflanagan/bug823783

Bug 823783: keep wifi hardware and wifi setting in sync r=kaze a=tef+