Merge change 4075 into donut

* changes:
  Add <keygen> support for VPN.