Merge "Don't complain if a VPN changes capabilities." into pi-dev
tree: f3e9d7bfbaea456df21464f5264117f76813d64d
  1. core/
  2. services/
  3. tests/