Merge "Rebuild wpa_supplicant.conf if the gen script is altered." into oc-gce-dev