Merge "Implementing XML client for VPNaaS"