Merge "Ensure config file for wpa_supplicant exists" into pi-dev