Merge "vFW and vDNS support added to azure-plugin"