Merge "Fix auto-join and wifiscanner test bed for key change" into m-wireless-dev