Bug 842544 - added try statement to pass captive portal tests on travis
Merge pull request #8188 from yurenju/captive-protal-test

Bug 842544 - added try statement to pass captive portal tests on travis, r=julienw
Bug 840497 - [SMS] Fix & restore Unit Tests r=julienw