Merge change 6738 into donut

* changes:
  rootdir: Remove ip-up-vpn script, which is replaced by an executable.