Merge "Make MockVpn more realistic and easier to use."
tree: df6c2768a07034c93583e64ddcb33d52743af1ff
  1. core/
  2. services/
  3. tests/