Fixes attributes when generating xml body for post deploy vapps.
Adds VPN section to edge gateway service configuration
Adds DHCP to edge gateway service configuration
Merge commit '03b5551b3a0b0bc2b241d878a6608b5eb94a4903'
Merge commit '6554ff867dccde7bc7b4f9d6c2612f10454908e9'