Merge "supplicant/hostapd(vts): Test for terminate" into pi-dev