am 160d4b05: Merge change 6738 into donut

Merge commit '160d4b0509e4566930ef9af4f2b9d63b33aebee5'

* commit '160d4b0509e4566930ef9af4f2b9d63b33aebee5':
  rootdir: Remove ip-up-vpn script, which is replaced by an executable.