Merge "Use a single socket to communicate with supplicant" into klp-dev