Merge change 6345 into donut

* changes:
  Add header 'blob://' in front of the cert/key names in wpa_supplicant.conf.