am 3d95dfc4: am 62de7421: Merge change I4fe2a47a into eclair

Merge commit '3d95dfc4f6b03511c76580690cf7f7364f29c0a5'

* commit '3d95dfc4f6b03511c76580690cf7f7364f29c0a5':
  Fix stopping all vpn daemons before connect and more.