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