Merge change I4fe2a47a into eclair

* changes:
  Fix stopping all vpn daemons before connect and more.