Merge changes from topic 'mwd-merge-wifi-062215' into mnc-dev

* changes:
  Added config_wifi_hotspot2_enabled.
  make sure wifi link stats are reset