Merge "conman:  Don't use wpa_supplicant control interface."