Wifi and settings fixes
Fix WIFI tests for 2.1
Merge pull request #538 from owdqa/bug/fix_wifi_2.1

Bug/fix wifi 2.1