Merge change 7069 into donut

* changes:
  Make VPN connect even when DNS is not present and other fixes.