Adds VPN section to edge gateway service configuration
Adds DHCP to edge gateway service configuration
Merge branch 'master' of https://github.com/fog/fog into edge-gateway
Merge pull request #2968 from dbatwa/edge-gateway

VCloud Director - Edge gateway