Merge changes I18f8929e,I40e5c315 into fp2-dev-v2

* changes:
  FP2-1259: WIFI-icon with exclamation mark although good connection
  FP2-1467: issue in register in Airport free WiFi