Merge "Update vpn and runtime deployment guides"