Merge "add uid and debug fields to wifiConfiguration"