[17.06] Backport missing MacPool and DisableGatewayDNS options

[thaJeztah]

This backports:

#1755 "Changes to support ICS network on windows" (adds com.docker.network.windowsshim.macpool option)
#2021 "Added a new network creation driver option (disable_gatewaydns) for the Windows driver" (adds com.docker.network.windowsshim.disable_gatewaydns option)

git checkout -b 17.06-backport-disable_gatewaydns upstream/bump_17.06
git cherry-pick -s -S -x a35f24ae0b90504562e3fad899342152605fd82c
git cherry-pick -s -S -x 884eaa0157709a3197b9696981c4f1ce0d86120b

No conflicts

NOTE: when just backporting #2021, the conflict below occurs (due to MacPool missing):

diff --cc drivers/windows/windows.go
index 014e93c7,964099cc..00000000
--- a/drivers/windows/windows.go
+++ b/drivers/windows/windows.go
@@@ -168,6 -178,24 +169,27 @@@ func (d *driver) parseNetworkOptions(i
                        config.DNSSuffix = value
                case DNSServers:
                        config.DNSServers = value
++<<<<<<< HEAD
++=======
+               case DisableGatewayDNS:
+                       b, err := strconv.ParseBool(value)
+                       if err != nil {
+                               return nil, err
+                       }
+                       config.DisableGatewayDNS = b
+               case MacPool:
+                       config.MacPools = make([]hcsshim.MacPool, 0)
+                       s := strings.Split(value, ",")
+                       if len(s)%2 != 0 {
+                               return nil, types.BadRequestErrorf("Invalid mac pool. You must specify both a start range and an end range")
+                       }
+                       for i := 0; i < len(s)-1; i += 2 {
+                               config.MacPools = append(config.MacPools, hcsshim.MacPool{
+                                       StartMacAddress: s[i],
+                                       EndMacAddress:   s[i+1],
+                               })
+                       }
++>>>>>>> 884eaa01... Added a new network creation driver option (disable_gatewaydns) for the Windows driver
                case VLAN:
                        vlan, err := strconv.ParseUint(value, 10, 32)
                        if err != nil {

[fcrisciani]

will come in 18.03