Merge pull request #418 from zacc/test_ftu_wifi_logic

Insert logic into test_ftu for wifi networks
Merge remote-tracking branch 'upstream/master' into new_eme_html