Merge "conman:  Experiment to prevent joining the WLAN on 2.4 GHz."