Merge change 6328 into donut

* changes:
  String fixes for the credential storage and vpn settings.