Merge change 4585

* changes:
  Add keystore & vpn to eclipse classpath.