Merge "/bin/wifi:  Save options per-interface rather than per-band."