Merge "Add test for using ESP_IP_VERSION and ESP_ENCAP_TYPE in Vpn"