Stop normal and blocking VPNs correctly
Small refactor to stop EIP methods.
Merge branch 'bug/Cancelling-failed-connection-leaves-network-blocked-#6446' into develop